merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Tue, 3 Apr 2007 19:04:51 +0000 (13:04 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Tue, 3 Apr 2007 19:04:51 +0000 (13:04 -0600)
commitb5c89a14c00cd8477c04f36f0c82a7e0d7f37f8c
treedc0e35ffa5c8e68fad713cb686fdf728b9974d2c
parent0d7e192430cc98be93769ea6aadf96519fab23b4
parent2bdbd3e1939805676f7b025a58d23cea942fe042
merge with xen-unstable.hg